Don't use XendRoot.get_vif_bridge to provide a default bridge -- instead, pass

no bridge parameter and let the vif-bridge script find one for itself.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py
index 6041e5ed467c3dea0f7f9e074769fbcbb4e6a1f0..d6f7671a6e9865887bc295fb1b5507d0108b9377 100644 (file)
--- a/tools/python/xen/xend/server/netif.py
+++ b/tools/python/xen/xend/server/netif.py
@@ -51,22 +51,22 @@ class NetifController(DevController):
         script = os.path.join(xroot.network_script_dir,
                               sxp.child_value(config, 'script',
                                               xroot.get_vif_script()))
-        bridge = sxp.child_value(config, 'bridge',
-                                 xroot.get_vif_bridge())
-        mac = sxp.child_value(config, 'mac')
+        bridge = sxp.child_value(config, 'bridge')
+        mac    = sxp.child_value(config, 'mac')
         ipaddr = _get_config_ipaddr(config)
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac' : mac,
-                 'bridge' : bridge,
+                 'mac'    : mac,
                  'handle' : "%i" % devid }
         if ipaddr:
             back['ip'] = ' '.join(ipaddr)
+        if bridge:
+            back['bridge'] = bridge
 
         front = { 'handle' : "%i" % devid,
-                  'mac' : mac }
+                  'mac'    : mac }
 
         return (devid, back, front)